Merge from mainline.
authorXue Fuqiao <xfq@gnu.org>
Thu, 27 Feb 2014 23:20:02 +0000 (07:20 +0800)
committerXue Fuqiao <xfq@gnu.org>
Thu, 27 Feb 2014 23:20:02 +0000 (07:20 +0800)
commit092f02effd96693e9909824dd103af283b0da759
tree35712fd5832ae945cb86f45a252d14e06bf62fd1
parent3edfdb997508312e42ff96e5585dafddc9f3e80e
parentf2ea95349de39fc7334c9bc8a855ddd9d0bedcaa
Merge from mainline.